Merge "Database search fixes:"